Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main #2

Open
wants to merge 629 commits into
base: master
Choose a base branch
from
Open

Main #2

wants to merge 629 commits into from

Conversation

OBorce
Copy link
Collaborator

@OBorce OBorce commented Sep 13, 2024

Update from trezor main to our master

obrusvit and others added 30 commits July 3, 2024 14:16
Bumps [certifi](https://github.com/certifi/python-certifi) from 2023.7.22 to 2024.7.4.
- [Commits](certifi/python-certifi@2023.07.22...2024.07.04)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
we need to cherry-pick two commits into the micropython submodule, and
adapt one of the fixes
jq --sort-keys -s '.[0] * .[1]' es.json es-ES_diff_tutorial.json > es.json.tmp && mv es.json.tmp es.json

[no changelog]
* move most actual functionality to LayoutObjInner
* subsume features of top-level Root and Child into LayoutObjInner
(saving ~7 kB of flash because LayoutObjInner is not generic)
* make use of GcBox to drop the top-level component
Previously, any C assertion or other case of __fatal_error would only
show the RSOD, but not print to emulator output.

That is (a) mildly annoying, and (b) would not work in the weird case in
Rust unit tests where graphics are not available.
TychoVrahe and others added 27 commits September 7, 2024 08:35
complicated flows that _do not accomplish results_ do not belong into
device_tests, so I moved them to click_tests and added stronger assert
system
this includes D001 / D002, that probably doesn't matter
…github

now that we don't really use gitlab anymore
to get rid of python 3.14 deprecation warnings
Python 3.11 changed IntEnum.__str__ to return the number instead of the
enum value name. This breaks fixtures.json because pytest uses
str(value) to generate the test identifier names, and in a lot of places
our identifiers use the enum values.

This override of `_idval_from_value` explicitly generates a name from
the IntEnum instead of using the __str__ implementation.
@ImplOfAnImpl
Copy link

I agree with the suggestion that we should branch off releases only and not pull main in unknown state. I suppose CI won't be failing then.

Also:

  1. we should probably create a separate branch called mintlayer_master or something like that, make it protected and use it instead of just master.
  2. we should make this a proper fork.

@azarovh
Copy link
Member

azarovh commented Oct 4, 2024

we should probably create a separate branch called mintlayer_master

Agree, having both main and master is confusing.
I'd suggest creating it from release/24.08 which is core 2.8.1. Then from time to time we can merge in more recent release branches. Note that I suggest skipping 24.09 which is the most recent because its CI is broken. Nothing major but still.

we should make this a proper fork.

You mean like github fork feature? Not sure that it's a good idea because there are some limitations for forks like if the original repo got banned and removed from github all forks go down as well. Keeping a copy seems like a safer option.

@ImplOfAnImpl
Copy link

You mean like github fork feature? Not sure that it's a good idea because there are some limitations for forks like if the original repo got banned and removed from github all forks go down as well. Keeping a copy seems like a safer option.

I don't think we should seriously consider the possibility of the official Trezor repo getting banned (and if it does happen, we can always create a copy post factum).

What worries me here is that installing an unsigned custom firmware will already be quite scary for users. And the device will constantly warn them about it with this nice screen. So they'll want to make sure that our fork is as "public" as possible, which should increase the probability of it being reviewed by larger number of people. Us not having a proper github fork may look like we're trying to avoid extra publicity, which may be seen as suspicious.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.